Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[NEW] close emoji box using Keyboard Escape key #13956

Merged
merged 5 commits into from
Oct 17, 2019

Conversation

mohamedar97
Copy link
Contributor

Closes #13929

added the option to close the emoji box with escape key and added auto focus to emoji search field

@CLAassistant
Copy link

CLAassistant commented Mar 30, 2019

CLA assistant check
All committers have signed the CLA.

Copy link
Contributor

@knrt10 knrt10 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mohamedar97 would you please uncommit package-lock.json and also rebase the code.

@mohamedar97
Copy link
Contributor Author

@knrt10 is this the change you wanted?

@knrt10
Copy link
Contributor

knrt10 commented Mar 30, 2019

This only solves for package-lock.json. See there is one conflicting file. You need to fetch and rebase your local branch and then push again

@knrt10
Copy link
Contributor

knrt10 commented Mar 30, 2019

No problem do this. Make sure this PR is from a fork. If not then

  • Create a fork
  • clone your fork
  • open terminal inside repo
  • add another remote name call it upstream with url as RC original repo url.
    git remote add upstream urlhere
  • git fetch upstream
  • git checkout your branch name
  • git rebase upstream/develop
  • git add .
  • git push origin your branch

For more info check git documentation on fetch and rebase.

@mohamedar97
Copy link
Contributor Author

@knrt10 okay i did it, thanks for your patience i'm kinda new to git and still learning

@@ -146,6 +146,10 @@ Template.messageBox.onCreated(function() {
this.isMicrophoneDenied = new ReactiveVar(true);
this.sendIconDisabled = new ReactiveVar(false);
messageBox.emit('created', this);
window.addEventListener('keydown',function(e){
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure this is the best place to do this code. @ggazzo / @tassoevan can you please advise the best place to do this?

@mohamedar97 also this code is not following our code style. please run meteor npm run lint before pushing your changes.

@sampaiodiego sampaiodiego modified the milestones: 1.3.0, 1.4.0 Jul 25, 2019
@sampaiodiego sampaiodiego modified the milestones: 2.0.0, 2.1.0 Sep 6, 2019
@engelgabriel engelgabriel modified the milestones: 2.1.0, 2.2.0 Oct 13, 2019
ggazzo
ggazzo previously approved these changes Oct 17, 2019
@ggazzo ggazzo changed the title [NEW ] additional functionality to emoji box [NEW] close emoji box using Keyboard Escape key Oct 17, 2019
@ggazzo ggazzo merged commit a536673 into RocketChat:develop Oct 17, 2019
@rodrigok rodrigok mentioned this pull request Oct 27, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Adding emoji to message: focus in the filter box and make escape work
7 participants